Use https in KML writer, esp. for geocaching and tracks.

Geocaching 'Other' tab:
* Reduce number of redirects to Google Maps.
* Drop StreetView. It can be reached from Maps.
* RIP Yahoo Maps, Microsoft Research Maps (nee Terraserver)
reference*: regenerate reference files.

diff --git a/kml.cc b/kml.cc
index 519488d4503d13c371a1b6147b5647224c178c11..d55110c472cb2a4614ea591138b231609bd65935 100644 (file)
--- a/kml.cc
+++ b/kml.cc
@@ -96,7 +96,7 @@ static gpsbabel::DateTime kml_time_max;
 #define DEFAULT_PRECISION "6"
 
 //  Icons provided and hosted by Google.  Used with permission.
-#define ICON_BASE "http://earth.google.com/images/kml-icons/"
+#define ICON_BASE "https://earth.google.com/images/kml-icons/"
 
 // Multitrack ids to correlate Schema to SchemaData
 static const char kmt_heartrate[] = "heartrate";
@@ -193,7 +193,7 @@ struct {
 };
 
 #define ICON_NOSAT ICON_BASE "youarehere-warning.png";
-#define ICON_WPT "http://maps.google.com/mapfiles/kml/pal4/icon61.png"
+#define ICON_WPT "https://maps.google.com/mapfiles/kml/pal4/icon61.png"
 #define ICON_TRK ICON_BASE "track-directional/track-none.png"
 #define ICON_RTE ICON_BASE "track-directional/track-none.png"
 #define ICON_MULTI_TRK ICON_BASE "track-directional/track-0.png"
@@ -1132,24 +1132,21 @@ void kml_gc_all_tabs_text(QString& cdataStr)
 {
   // cdataStr.append("<a href=\"http://www.geocaching.com\"><img style=\"float: left; padding: 10px\" src=\"http://www.geocaching.com/images/nav/logo_sub.gif\" /> </a>\n");
   cdataStr.append("<img align=\"right\" src=\"$[gc_icon]\" />\n");
-  cdataStr.append("<a href=\"http://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]\"><b>$[gc_num]</b></a> <b>$[gc_name]</b> \n");
-  cdataStr.append("a $[gc_type],<br />on $[gc_placed] by <a href=\"http://www.geocaching.com/profile?id=$[gc_placer_id\">$[gc_placer]</a><br/>\n");
-  cdataStr.append("Difficulty: <img src=\"http://www.geocaching.com/images/stars/$[gc_diff_stars].gif\" alt=\"$[gc_diff]\" width=\"61\" height=\"13\" />\n");
-  cdataStr.append("&nbsp;Terrain: <img src=\"http://www.geocaching.com/images/stars/$[gc_terr_stars].gif\" alt=\"$[gc_terr]\" width=\"61\" height=\"13\" /><br />\n");
-  cdataStr.append("Size: <img src=\"http://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif\" width=\"45\" height=\"12\" alt=\"$[gc_cont_icon]\"/>&nbsp;($[gc_cont_icon])<br />\n");
+  cdataStr.append("<a href=\"https://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]\"><b>$[gc_num]</b></a> <b>$[gc_name]</b> \n");
+  cdataStr.append("a $[gc_type],<br />on $[gc_placed] by <a href=\"https://www.geocaching.com/profile?id=$[gc_placer_id\">$[gc_placer]</a><br/>\n");
+  cdataStr.append("Difficulty: <img src=\"https://www.geocaching.com/images/stars/$[gc_diff_stars].gif\" alt=\"$[gc_diff]\" width=\"61\" height=\"13\" />\n");
+  cdataStr.append("&nbsp;Terrain: <img src=\"https://www.geocaching.com/images/stars/$[gc_terr_stars].gif\" alt=\"$[gc_terr]\" width=\"61\" height=\"13\" /><br />\n");
+  cdataStr.append("Size: <img src=\"https://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif\" width=\"45\" height=\"12\" alt=\"$[gc_cont_icon]\"/>&nbsp;($[gc_cont_icon])<br />\n");
 
 }
 
 static const QString map_templates[] = {
-  "<a href=\"http://maps.google.com/maps?q=$[gc_lat],$[gc_lon]\" target=\"_blank\">Google Maps</a>",
-  "<a href=\"http://maps.google.com/maps?q=$[gc_lat],$[gc_lon]\" target=\"_blank\">Google Street View</a>",
+  "<a href=\"https://www.google.com/maps?q=$[gc_lat],$[gc_lon]\" target=\"_blank\">Google Maps</a>",
   "<a href=\"http://www.geocaching.com/map/default.aspx?lat=$[gc_lat]&lng=$[gc_lon]\" target=\"_blank\">Geocaching.com Google Map</a>",
   "<a href=\"http://www.mytopo.com/maps.cfm?lat=$[gc_lat]&lon=$[gc_lon]&pid=groundspeak\" target=\"_blank\">MyTopo Maps</a>",
   "<a href=\"http://www.mapquest.com/maps/map.adp?searchtype=address&formtype=latlong&latlongtype=decimal&latitude=$[gc_lat]&longitude=$[gc_lon]&zoom=10\" target=\"_blank\">MapQuest</a>",
   "<a href=\"http://www.bing.com/maps/default.aspx?v=2&sp=point.$[gc_lat]$[gc_lon]\" target=\"_blank\">Bing Maps</a>",
-  "<a href=\"http://maps.yahoo.com/maps_result?lat=$[gc_lat]&lon=$[gc_lon]\" target=\"_blank\">Yahoo Maps</a>",
   "<a href=\"http://maps.randmcnally.com/#s=screen&lat=$[gc_lat]&lon=$[gc_lon]&zoom=13&loc1=$[gc_lat],$[gc_lon]\" target=\"_blank\">Rand McNally</a>",
-  "<a href=\"http://msrmaps.com/image.aspx?Lon=$[gc_lon]&Lat=$[gc_lat]&w=1&ref=G|$[gc_lon],$[gc_lat]\" target=\"_blank\">MSR Maps (Formerly Terraserver)</a>",
   "<a href=\"http://www.opencyclemap.org/?zoom=12&lat=$[gc_lat]&lon=$[gc_lon]\" target=\"_blank\">Open Cycle Maps</a>",
   "<a href=\"http://www.openstreetmap.org/?mlat=$[gc_lat]&mlon=$[gc_lon]&zoom=12\" target=\"_blank\">Open Street Maps</a>",
   NULL
@@ -1168,9 +1165,9 @@ void kml_gc_make_balloonstyletext(void)
   cdataStr.append("<!DOCTYPE html>\n");
   cdataStr.append("<html>\n");
   cdataStr.append("<head>\n");
-  cdataStr.append("<link href=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css\" rel=\"stylesheet\" type=\"text/css\"/>\n");
-  cdataStr.append("<script src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js\"></script>\n");
-  cdataStr.append("<script src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js\"></script>\n");
+  cdataStr.append("<link href=\"https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.css\" rel=\"stylesheet\" type=\"text/css\"/>\n");
+  cdataStr.append("<script src=\"https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js\"></script>\n");
+  cdataStr.append("<script src=\"https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js\"></script>\n");
   cdataStr.append("<script>\n");
   cdataStr.append("$(document).ready(function() {\n");
   cdataStr.append("  $(\"#tabs\").tabs();\n");
@@ -1329,7 +1326,7 @@ kml_lookup_gc_icon(const Waypoint* waypointp)
     break;
   }
 
-  return QString("http://www.geocaching.com/images/kml/%1").arg(icon);
+  return QString("https://www.geocaching.com/images/kml/%1").arg(icon);
 }
 
 static const

diff --git a/reference/LineStyles.kml b/reference/LineStyles.kml
index 30c4b97f30ae804503921697fb2e1321659f239a..77c81ca371ed63e0eeeebee5f32bf5750cc6a94c 100644 (file)
--- a/reference/LineStyles.kml
+++ b/reference/LineStyles.kml
@@ -12,7 +12,7 @@
       <IconStyle>
         <scale>.5</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -24,7 +24,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -42,7 +42,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -51,7 +51,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/bounds-test.kml b/reference/bounds-test.kml
index 60a46359c07da02d49f94d0d9a68dc53339bbb0f..1cae4cdff0c021bbdfd760cf3c0d8cf1e1c38f82 100644 (file)
--- a/reference/bounds-test.kml
+++ b/reference/bounds-test.kml
@@ -11,7 +11,7 @@
     <Style id="route_n">
       <IconStyle>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -20,7 +20,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -38,7 +38,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -47,7 +47,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/earth-expertgps-track.kml b/reference/earth-expertgps-track.kml
index e11ea7c9a9e717fe316888a74540d3c609fbd7b7..97b7d1d35affab8958113e4e8ab23573310186f3 100644 (file)
--- a/reference/earth-expertgps-track.kml
+++ b/reference/earth-expertgps-track.kml
@@ -15,7 +15,7 @@
     <Style id="route_n">
       <IconStyle>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -24,7 +24,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -43,7 +43,7 @@
       <IconStyle>
         <scale>.5</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -55,7 +55,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -73,7 +73,7 @@
     <Style id="multiTrack_n">
       <IconStyle>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -86,7 +86,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -108,7 +108,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -117,7 +117,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/earth-expertgps.kml b/reference/earth-expertgps.kml
index 50a3b1c79bdbc2a9333154674ff945be81686662..3ff94b3c08661f8321ebc0c2a465135560420ac5 100644 (file)
--- a/reference/earth-expertgps.kml
+++ b/reference/earth-expertgps.kml
@@ -15,7 +15,7 @@
     <Style id="route_n">
       <IconStyle>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -24,7 +24,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -43,7 +43,7 @@
       <IconStyle>
         <scale>.5</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -55,7 +55,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -73,7 +73,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -82,7 +82,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/earth-gc.kml b/reference/earth-gc.kml
index 7056da8d07c190fa109190f1eff37ae694a25aa7..5e5ecbfc9fb22857161cb600cf5a30d10fe0de38 100644 (file)
--- a/reference/earth-gc.kml
+++ b/reference/earth-gc.kml
@@ -15,7 +15,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -24,7 +24,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -50,9 +50,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
+<link href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 <script>
 $(document).ready(function() {
   $("#tabs").tabs();
@@ -69,37 +69,35 @@ $(document).ready(function() {
 
 <div id="fragment-1">
 <img align="right" src="$[gc_icon]" />
-<a href="http://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
-a $[gc_type],<br />on $[gc_placed] by <a href="http://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
-Difficulty: <img src="http://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
-&nbsp;Terrain: <img src="http://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
-Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
+<a href="https://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
+a $[gc_type],<br />on $[gc_placed] by <a href="https://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
+Difficulty: <img src="https://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
+&nbsp;Terrain: <img src="https://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
+Size: <img src="https://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
   <p />$[gc_issues]
   $[gc_short_desc]
   $[gc_long_desc]
 </div>
 <div id="fragment-2">
 <img align="right" src="$[gc_icon]" />
-<a href="http://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
-a $[gc_type],<br />on $[gc_placed] by <a href="http://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
-Difficulty: <img src="http://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
-&nbsp;Terrain: <img src="http://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
-Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
+<a href="https://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
+a $[gc_type],<br />on $[gc_placed] by <a href="https://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
+Difficulty: <img src="https://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
+&nbsp;Terrain: <img src="https://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
+Size: <img src="https://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
   $[gc_logs]
 </div>
 <div id="fragment-3">
 <img align="right" src="$[gc_icon]" />
-<a href="http://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
-a $[gc_type],<br />on $[gc_placed] by <a href="http://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
-Difficulty: <img src="http://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
-&nbsp;Terrain: <img src="http://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
-Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
+<a href="https://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
+a $[gc_type],<br />on $[gc_placed] by <a href="https://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
+Difficulty: <img src="https://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
+&nbsp;Terrain: <img src="https://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
+Size: <img src="https://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
   <h1>Extra Maps</h1>
   <ul>
     <li>
-    <a href="http://maps.google.com/maps?q=$[gc_lat],$[gc_lon]" target="_blank">Google Maps</a></li>
-    <li>
-    <a href="http://maps.google.com/maps?q=$[gc_lat],$[gc_lon]" target="_blank">Google Street View</a></li>
+    <a href="https://www.google.com/maps?q=$[gc_lat],$[gc_lon]" target="_blank">Google Maps</a></li>
     <li>
     <a href="http://www.geocaching.com/map/default.aspx?lat=$[gc_lat]&lng=$[gc_lon]" target="_blank">Geocaching.com Google Map</a></li>
     <li>
@@ -109,12 +107,8 @@ Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon]
     <li>
     <a href="http://www.bing.com/maps/default.aspx?v=2&sp=point.$[gc_lat]$[gc_lon]" target="_blank">Bing Maps</a></li>
     <li>
-    <a href="http://maps.yahoo.com/maps_result?lat=$[gc_lat]&lon=$[gc_lon]" target="_blank">Yahoo Maps</a></li>
-    <li>
     <a href="http://maps.randmcnally.com/#s=screen&lat=$[gc_lat]&lon=$[gc_lon]&zoom=13&loc1=$[gc_lat],$[gc_lon]" target="_blank">Rand McNally</a></li>
     <li>
-    <a href="http://msrmaps.com/image.aspx?Lon=$[gc_lon]&Lat=$[gc_lat]&w=1&ref=G|$[gc_lon],$[gc_lat]" target="_blank">MSR Maps (Formerly Terraserver)</a></li>
-    <li>
     <a href="http://www.opencyclemap.org/?zoom=12&lat=$[gc_lat]&lon=$[gc_lon]" target="_blank">Open Cycle Maps</a></li>
     <li>
     <a href="http://www.openstreetmap.org/?mlat=$[gc_lat]&mlon=$[gc_lon]&zoom=12" target="_blank">Open Street Maps</a></li>
@@ -138,9 +132,9 @@ Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon]
 <!DOCTYPE html>
 <html>
 <head>
-<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
+<link href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 <script>
 $(document).ready(function() {
   $("#tabs").tabs();
@@ -157,37 +151,35 @@ $(document).ready(function() {
 
 <div id="fragment-1">
 <img align="right" src="$[gc_icon]" />
-<a href="http://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
-a $[gc_type],<br />on $[gc_placed] by <a href="http://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
-Difficulty: <img src="http://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
-&nbsp;Terrain: <img src="http://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
-Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
+<a href="https://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
+a $[gc_type],<br />on $[gc_placed] by <a href="https://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
+Difficulty: <img src="https://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
+&nbsp;Terrain: <img src="https://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
+Size: <img src="https://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
   <p />$[gc_issues]
   $[gc_short_desc]
   $[gc_long_desc]
 </div>
 <div id="fragment-2">
 <img align="right" src="$[gc_icon]" />
-<a href="http://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
-a $[gc_type],<br />on $[gc_placed] by <a href="http://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
-Difficulty: <img src="http://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
-&nbsp;Terrain: <img src="http://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
-Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
+<a href="https://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
+a $[gc_type],<br />on $[gc_placed] by <a href="https://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
+Difficulty: <img src="https://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
+&nbsp;Terrain: <img src="https://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
+Size: <img src="https://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
   $[gc_logs]
 </div>
 <div id="fragment-3">
 <img align="right" src="$[gc_icon]" />
-<a href="http://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
-a $[gc_type],<br />on $[gc_placed] by <a href="http://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
-Difficulty: <img src="http://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
-&nbsp;Terrain: <img src="http://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
-Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
+<a href="https://www.geocaching.com/seek/cache_details.aspx?wp=$[gc_num]"><b>$[gc_num]</b></a> <b>$[gc_name]</b> 
+a $[gc_type],<br />on $[gc_placed] by <a href="https://www.geocaching.com/profile?id=$[gc_placer_id">$[gc_placer]</a><br/>
+Difficulty: <img src="https://www.geocaching.com/images/stars/$[gc_diff_stars].gif" alt="$[gc_diff]" width="61" height="13" />
+&nbsp;Terrain: <img src="https://www.geocaching.com/images/stars/$[gc_terr_stars].gif" alt="$[gc_terr]" width="61" height="13" /><br />
+Size: <img src="https://www.geocaching.com/images/icons/container/$[gc_cont_icon].gif" width="45" height="12" alt="$[gc_cont_icon]"/>&nbsp;($[gc_cont_icon])<br />
   <h1>Extra Maps</h1>
   <ul>
     <li>
-    <a href="http://maps.google.com/maps?q=$[gc_lat],$[gc_lon]" target="_blank">Google Maps</a></li>
-    <li>
-    <a href="http://maps.google.com/maps?q=$[gc_lat],$[gc_lon]" target="_blank">Google Street View</a></li>
+    <a href="https://www.google.com/maps?q=$[gc_lat],$[gc_lon]" target="_blank">Google Maps</a></li>
     <li>
     <a href="http://www.geocaching.com/map/default.aspx?lat=$[gc_lat]&lng=$[gc_lon]" target="_blank">Geocaching.com Google Map</a></li>
     <li>
@@ -197,12 +189,8 @@ Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon]
     <li>
     <a href="http://www.bing.com/maps/default.aspx?v=2&sp=point.$[gc_lat]$[gc_lon]" target="_blank">Bing Maps</a></li>
     <li>
-    <a href="http://maps.yahoo.com/maps_result?lat=$[gc_lat]&lon=$[gc_lon]" target="_blank">Yahoo Maps</a></li>
-    <li>
     <a href="http://maps.randmcnally.com/#s=screen&lat=$[gc_lat]&lon=$[gc_lon]&zoom=13&loc1=$[gc_lat],$[gc_lon]" target="_blank">Rand McNally</a></li>
     <li>
-    <a href="http://msrmaps.com/image.aspx?Lon=$[gc_lon]&Lat=$[gc_lat]&w=1&ref=G|$[gc_lon],$[gc_lat]" target="_blank">MSR Maps (Formerly Terraserver)</a></li>
-    <li>
     <a href="http://www.opencyclemap.org/?zoom=12&lat=$[gc_lat]&lon=$[gc_lon]" target="_blank">Open Cycle Maps</a></li>
     <li>
     <a href="http://www.openstreetmap.org/?mlat=$[gc_lat]&mlon=$[gc_lon]&zoom=12" target="_blank">Open Street Maps</a></li>
@@ -233,7 +221,7 @@ Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon]
         <Style>
           <IconStyle>
             <Icon>
-              <href>http://www.geocaching.com/images/kml/8.png</href>
+              <href>https://www.geocaching.com/images/kml/8.png</href>
             </Icon>
           </IconStyle>
         </Style>
@@ -275,7 +263,7 @@ Size: <img src="http://www.geocaching.com/images/icons/container/$[gc_cont_icon]
             <value>Locationless (Reverse) Cache</value>
           </Data>
           <Data name="gc_icon">
-            <value>http://www.geocaching.com/images/kml/8.png</value>
+            <value>https://www.geocaching.com/images/kml/8.png</value>
           </Data>
           <Data name="gc_short_desc">
             <value><![CDATA[LES COORDONÉES PUBLIÉES NE REPRÉSENTENT PAS LA LOCALISATION D'UNE CACHE
@@ -368,7 +356,7 @@ Enjoy !</p>]]></value>
         <Style>
           <IconStyle>
             <Icon>
-              <href>http://www.geocaching.com/images/kml/8.png</href>
+              <href>https://www.geocaching.com/images/kml/8.png</href>
             </Icon>
           </IconStyle>
         </Style>
@@ -410,7 +398,7 @@ Enjoy !</p>]]></value>
             <value>Unknown Cache</value>
           </Data>
           <Data name="gc_icon">
-            <value>http://www.geocaching.com/images/kml/8.png</value>
+            <value>https://www.geocaching.com/images/kml/8.png</value>
           </Data>
           <Data name="gc_short_desc">
             <value><![CDATA[The cache is not at the coordinates above.   These coords will get you to the correct park and within 1/2 mile of the cache.  The cache is within 35 feet of the trail.   It is not handicapped accessible.   It is a nice walk in the woods that is practical for all ages.  There is no space in the container for trading items.   You should bring a writing stick and bug spray is recommended.]]></value>

diff --git a/reference/track/bounds-test-track.kml b/reference/track/bounds-test-track.kml
index cd758ec1e98ab5628ac2e1996ff7abc0a5739230..7ce4cecf943ef70c1cea36ad76962a6ea6c974db 100644 (file)
--- a/reference/track/bounds-test-track.kml
+++ b/reference/track/bounds-test-track.kml
@@ -12,7 +12,7 @@
       <IconStyle>
         <scale>.5</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -24,7 +24,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -42,7 +42,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -51,7 +51,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/track/gpx_garmin_extensions-kml_track.kml b/reference/track/gpx_garmin_extensions-kml_track.kml
index ee623f5611bfbf21f8faef3bc159b1fb6162413c..8cec5884bd4cea4517e88ace629c5aecd41d9a6d 100644 (file)
--- a/reference/track/gpx_garmin_extensions-kml_track.kml
+++ b/reference/track/gpx_garmin_extensions-kml_track.kml
@@ -16,7 +16,7 @@
       <IconStyle>
         <scale>.5</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -28,7 +28,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -46,7 +46,7 @@
     <Style id="multiTrack_n">
       <IconStyle>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -59,7 +59,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -81,7 +81,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -90,7 +90,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/track/gtrnctr_power-kml.kml b/reference/track/gtrnctr_power-kml.kml
index 27a1f0d322be1c42225c319a9ef5933918499a63..a5f5003708b09043800a019bd53a41b4895875dd 100644 (file)
--- a/reference/track/gtrnctr_power-kml.kml
+++ b/reference/track/gtrnctr_power-kml.kml
@@ -16,7 +16,7 @@
       <IconStyle>
         <scale>.5</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -28,7 +28,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -46,7 +46,7 @@
     <Style id="multiTrack_n">
       <IconStyle>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -59,7 +59,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -81,7 +81,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -90,7 +90,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/track/segmented_tracks-track.kml b/reference/track/segmented_tracks-track.kml
index 8050d7f8e93f8105fec82df3faac48b870f47822..f854174ab59988d13252f0af0050f227f9828f55 100644 (file)
--- a/reference/track/segmented_tracks-track.kml
+++ b/reference/track/segmented_tracks-track.kml
@@ -16,7 +16,7 @@
       <IconStyle>
         <scale>.5</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -28,7 +28,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -46,7 +46,7 @@
     <Style id="multiTrack_n">
       <IconStyle>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -59,7 +59,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -81,7 +81,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -90,7 +90,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/track/segmented_tracks.kml b/reference/track/segmented_tracks.kml
index e0cc455c3047d39066854e970b99a10825880ee1..54ef393031bf125016e9438c6d65cbd477a7601e 100644 (file)
--- a/reference/track/segmented_tracks.kml
+++ b/reference/track/segmented_tracks.kml
@@ -16,7 +16,7 @@
       <IconStyle>
         <scale>.5</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -28,7 +28,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -46,7 +46,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -55,7 +55,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/reference/track/tracks~gpx.kml b/reference/track/tracks~gpx.kml
index 5c5e9b9aad4e5586e1b7dfbfd38f0bd810bf58aa..8bb9aa3597f0cc06bca52615fe524215bb968e2f 100644 (file)
--- a/reference/track/tracks~gpx.kml
+++ b/reference/track/tracks~gpx.kml
@@ -17,7 +17,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -30,7 +30,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-none.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -50,7 +50,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -63,7 +63,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -83,7 +83,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-1.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-1.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -96,7 +96,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-1.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-1.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -116,7 +116,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-2.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-2.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -129,7 +129,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-2.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-2.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -149,7 +149,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-3.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-3.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -162,7 +162,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-3.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-3.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -182,7 +182,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-4.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-4.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -195,7 +195,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-4.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-4.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -215,7 +215,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-5.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-5.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -228,7 +228,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-5.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-5.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -248,7 +248,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-6.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-6.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -261,7 +261,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-6.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-6.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -281,7 +281,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-7.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-7.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -294,7 +294,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-7.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-7.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -314,7 +314,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-8.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-8.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -327,7 +327,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-8.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-8.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -347,7 +347,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-9.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-9.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -360,7 +360,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-9.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-9.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -380,7 +380,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-10.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-10.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -393,7 +393,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-10.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-10.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -413,7 +413,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-11.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-11.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -426,7 +426,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-11.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-11.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -446,7 +446,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-12.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-12.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -459,7 +459,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-12.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-12.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -479,7 +479,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-13.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-13.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -492,7 +492,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-13.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-13.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -512,7 +512,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-14.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-14.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -525,7 +525,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-14.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-14.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -545,7 +545,7 @@
         <scale>.5</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-15.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-15.png</href>
         </Icon>
       </IconStyle>
       <LabelStyle>
@@ -558,7 +558,7 @@
         <scale>1.2</scale>
         <heading>0</heading>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-15.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-15.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -576,7 +576,7 @@
     <Style id="multiTrack_n">
       <IconStyle>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -589,7 +589,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
+          <href>https://earth.google.com/images/kml-icons/track-directional/track-0.png</href>
         </Icon>
       </IconStyle>
       <LineStyle>
@@ -611,7 +611,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -620,7 +620,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
+          <href>https://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>

diff --git a/testo.d/geojson.test b/testo.d/geojson.test
index c4191efd57b74b58aed33985157c258bc6758790..bb835ce346ca1d7888aba9b6ffebe23e6bf82469 100644 (file)
--- a/testo.d/geojson.test
+++ b/testo.d/geojson.test
@@ -1,5 +1,5 @@
 #
-# As this format is initially write-only, we're comparing our own "golden"
+# As this format was initially write-only, we're comparing our own "golden"
 # output to what the newly built writer creates. 
 #
 
@@ -8,3 +8,6 @@ compare ${REFERENCE}/geocaching~json.json ${TMPDIR}/geo.json
 
 gpsbabel -i gpx -f ${REFERENCE}/track/segmented_tracks.gpx -o geojson -F ${TMPDIR}/track.json
 compare ${REFERENCE}/track/segmented_tracks~geojson.json ${TMPDIR}/track.json
+
+gpsbabel -i geojson -f ${REFERENCE}/track/geojson.geojson -o gpx -F ${TMPDIR}/geojson.gpx
+compare ${REFERENCE}/track/geojson.gpx  ${TMPDIR}/geojson.gpx